merge trunk
authorKenichi Handa <handa@gnu.org>
Sat, 29 Jun 2013 03:44:38 +0000 (12:44 +0900)
committerKenichi Handa <handa@gnu.org>
Sat, 29 Jun 2013 03:44:38 +0000 (12:44 +0900)

Trivial merge